From: Jim Blandy <jimb@redhat.com>
Date: Thu, 25 Mar 1993 02:54:23 +0000 (+0000)
Subject: * dispnew.c (init_display): Get display name from environment
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~96701
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d460af17a8a1a8ff264b22c91a9652d8c45df435;p=emacs.git

* dispnew.c (init_display): Get display name from environment
	properly on VMS as well as Unix.
---

diff --git a/src/dispnew.c b/src/dispnew.c
index c106c32980d..25eccf95967 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1994,7 +1994,15 @@ init_display ()
      with an error message if that doesn't work.  */
 
 #ifdef HAVE_X_WINDOWS
-  if (!inhibit_window_system && (display_arg || getenv ("DISPLAY")))
+  if (! display_arg)
+    {
+#ifdef VMS
+      display_arg = getenv ("DECW$DISPLAY");
+#else
+      display_arg = getenv ("DISPLAY");
+#endif
+
+  if (!inhibit_window_system && display_arg)
     {
       Vwindow_system = intern ("x");
 #ifdef HAVE_X11